Warning cleanup. Bump internal version # for popp beta.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 94b823b26307849eb8e0dc3cf2f36622d50b9a09..ff7fb391a42f2f7956738cef2fc42fe919bb1295 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -35,8 +35,8 @@ dep:
        make clean && make CC="gcc -MMD"  && cat *.d */*.d > /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_1_1_beta01172003
-VERSIOND=1.1.1_beta01172003
+VERSIONU=1_1_1_beta01192003
+VERSIOND=1.1.1_beta01192003
 release:
        rm -fr gpsbabel-$(VERSIOND)
        cvs tag gpsbabel_$(VERSIONU)

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index b0e9a774f5af19dcf56664a5445a1a7b1f596ed7..0ced00cd4c9a534c90fad2a1180ebf7d24cdb55d 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -23,6 +23,7 @@
 
 #include "defs.h"
 #include "mapsend.h"
+#include "magellan.h"
 
 static FILE *mapsend_file_in;
 static FILE *mapsend_file_out;
@@ -317,7 +318,7 @@ mapsend_waypt_pr(const waypoint *waypointp)
        double flong;
        double flat;
        static int cnt = 0;
-       char *iconp;
+       const char *iconp;
        const char *sn = global_opts.synthesize_shortnames ? 
                mkshort(mkshort_handle, waypointp->description) :
                waypointp->shortname;

diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index dc77471cfdb77c76651b3e0201a53c5e1efaab93..958b52bb2104cc824f2c0c246aa080561c0343fb 100644 (file)
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -103,7 +103,7 @@ mkshort_del_handle(void *h)
                for (i = 0; i < PRIME; i++) {
                        queue *e, *t, *z;
                        QUEUE_FOR_EACH(&hdr->namelist[i], e, t) {
-                               uniq_shortname *s = e;
+                               uniq_shortname *s = (uniq_shortname *) e;
                                dequeue(e);
                                free(s->orig_shortname);
                                free(s);